Merge ChangeLog from trunk better.
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 2 Jun 2011 08:40:41 +0000 (01:40 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 2 Jun 2011 08:40:41 +0000 (01:40 -0700)
commit58a62ce4c0d82a0b13bfa6af1881bb3c56889831
treef3948030c0d76362b04be6d5381d177662f8eb4a
parentc828c8ed2243b7b1b284c9576d70a14a81445de6
Merge ChangeLog from trunk better.
ChangeLog
src/ChangeLog